DCS 211: Git and GitHub Collaboration

Instructor: Chris Agbonkhese

Today's Focus

• Understanding Git collaboration workflow
• Working with shared repositories on GitHub
• Experiencing merge conflicts
• Learning how to resolve conflicts professionally

Lab Activity

You will work in groups of two students. Each group will collaborate on a shared GitHub repository.

Tasks

1. Clone the repository provided by the instructor.
2. Each member edits the same Python file.
3. Commit and push your changes.
4. Observe any merge conflicts that occur.
5. Resolve the conflict as a team.

Time Allocation

• Lab duration: 40 minutes
• Report submission deadline: 20 minutes after class

Deliverables

• Screenshot of your GitHub commits
• Explanation of any conflict encountered
• Steps taken to resolve it

Goal: By the end of this lab, you should be comfortable collaborating using GitHub and handling conflicts — a key real-world skill for software development and research collaboration.